ANDROID: KVM: arm64: Fix CPU type when reading trace_pdesc

Prevent negative value reading from the trace descriptor. While at it,
remove that variable shadowing for more clarity.

Bug: 442540376
Bug: 357781595
Change-Id: I102df353b2b57cc44ebb93e97f8c1e4f589a5e84
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>

arch/arm64/kvm/hyp/nvhe/trace.c

diff --git a/arch/arm64/kvm/hyp/nvhe/trace.c b/arch/arm64/kvm/hyp/nvhe/trace.c
index 20e011a..0a0a4d4 100644
--- a/arch/arm64/kvm/hyp/nvhe/trace.c
+++ b/arch/arm64/kvm/hyp/nvhe/trace.c
@@ -559,7 +559,7 @@ int __pkvm_load_tracing(unsigned long pack_hva, size_t pack_size)
 	struct trace_buffer_pack *trace_pack = &pack->trace_buffer_pack;
 	struct hyp_buffer_page *bpage_backing_start;
 	struct ring_buffer_pack *rb_pack;
-	int ret, cpu;
+	int ret, pack_cpu;
 
 	if (!pack_size || !PAGE_ALIGNED(pack_hva) || !PAGE_ALIGNED(pack_size))
 		return -EINVAL;
@@ -579,9 +579,9 @@ int __pkvm_load_tracing(unsigned long pack_hva, size_t pack_size)
 
 	bpage_backing_start = (struct hyp_buffer_page *)hyp_buffer_pages_backing.start;
 
-	for_each_ring_buffer_pack(rb_pack, cpu, trace_pack) {
+	for_each_ring_buffer_pack(rb_pack, pack_cpu, trace_pack) {
 		struct hyp_rb_per_cpu *cpu_buffer;
-		int cpu;
+		unsigned int cpu;
 
 		ret = -EINVAL;
 		if (!rb_cpu_fits_pack(rb_pack, pack_hva + pack_size))